refactor tests :P