Tests: naming convention fixes