Some clean-up and new failing tests