Merge "fix: Rename test classes causing accidental skip"