Old classes deleted.
New test classes and implementation