Refactor tests so we can run individually