Removed Tests.java and added temporary bug fix