modified tests to work with the new grammer