Fix for test adaption