Renaming test classes. Fixing bug #12