stop using class names, now with tests