Simplified test structure and renamed files to match coding conventions