Did all the testing.

Also did some minor clean up before testing.