Refactor to post-test