Cleanup and experimenting with testing.