Refactor test values