Junit testing

Many Junit tests!