Fix unit tests
Merge branch 'master' into wander-web
Improve Ant buildfile