Renamed some methods, wrote new tests, all pass