Various testing fixes and improvements 

Tests have now been run (and passed) against a range of Enterprise and Community servers (3.4 -> HEAD).