Cleanup and some testing