Removing unused code
Minor test refactor