JUNIT Tests updated