Adjusted unit tests