Refactor test approach