Minor changes to the JUNIT Tests