fixed some failures which raised by executing the tests