JUNIT tests updated