adjusted unit tests