WIP tests and fixes TODO

TODO:
  - check whether the semantics have not changed an put it away
2 files changed