Fefactored some test code, non-functional.