Refactor test objects