Added JUNIT Tests