Better method name, tests passing