cleaned up some unit tests