Refactor test for conventions