Adding failing cases and cleaning up.