changed some unit tests and things