Fixed couple of Junit problems