Take out php6 style expect strings and add more checks to the test