Cleanup
Some dirty tests