cleaned more, added test (we currently fail)