Some cleanup after merges, and added some more to the tests