Converted unit tests to junit 4