Major test refactor finished