Renamed test class
Added tests