Fixes for unit tests (did not realize, that there was an Ant test target)