New JUnit tests.Pointed out a few errors git status