Correct test grammar; add siplify function.