Sort query output
Fill in some basic executable tests

Remove now-redundant version test.