start fixing unit tests
more write-up