Fixed build-path issues.  Tests now run from ant again.