Refactoring test classes (better naming, emphasize API usage strategies)