Renamed tests to be in line with edx