Refactor test location