Fixed tests, 3 are ignored because assumptions are violated, did further cleanup