Fixes issues with WFS SRS parameter and general Test cleanup

Please don't merge until Travis runs the tests for this PR!