Cleanup, and split out failing tests