fixed some failures during the execution of the tests