refactor tests a little more