Cleanup and way more tests