Andre: Finished fixing Junit Tests