added junit tests
cleanup