Fixed JUNIT issues