Minor test refactor
Minor fixes