More tests for WampServer, plus tidy up