Refactor tests

t