Fixed tests (for maven support)