Make basic syntax changes to make tests pass