Further refactor tests, start cleaning up duplicates
Clean up more duplicates