added some junit tests and more solo. tests