You are right! Sorry

Well, then you should make two tests and use the junit [assume](http://junit.sourceforge.net/javadoc/org/junit/Assume.html) feature to run the tests just if the environment supports that feature.

In future we should run make the acceptance test run a server by itself with different environments. That way hudson would be able to test multiple envs

BTW, you should make individual PRs for each  fix/feature, that way we can merge one by one