Finally all tests pass and everything seems to be working as expected