remove/fix failing tests