class rename, new test, test updates