Started re-write of tests.