Added more junit tests to other files