fixed up all other tests