Renamed roles for consistency
Added more tests