Adjusted unitests