fix issue and check tests