Refactor tests for great justice!