Started re-writing test code