Some modifications of syntax to make test work