Fixed junit tests
Minor changes