Resolve #3 - Cleanup the test code correctly.