(QENG-299) Added support for EOS

I was following the pattern in the tests around this functionality, but upon looking further after seeing these comments, I've found they're not necessary for the spec tests to pass.  I'll remove them in a subsequent commit