More testing refactor joy