Converted to Junit4