proper class names + tests