* refactor tests