Fixed tests for class naming issue