initial
tests and fixes