#5 fixed tests due last changes