Fix completion unit tests, fix ANT unit tests