Rename classes and create simple test