revisited and changed some unit tests