correct some minor fails, remove incomplete test