Final changes made - junit tests completed