Adjusted naming conv

And renamed 2 tests with long names