Removing complete; test refactor