Change class name and add first real test