Added more files for Junit tests