Restructured test classes and improved readability