Tests

Merging test cases into master. The Junit tests we added pass.