Added more junit tests/moved tests into test file
Updated Readme