Alex fixed tests :)