Refactor tests more