Removed incomplete test
fixed some broken tests