sort filter test working
Added current dia, still needs to be prettied up
Merge pull request #242 from pachalad/noMockServer

Added current dia, still needs to be prettied up
Merge remote-tracking branch 'upstream/noMockServer' into noMockServer