Fixed tests in 364a24fd1e051607d9cb8c8fec852c361a982c59