Add some additional testing
Clean up