Updated tests to support 4.1
Merge branch '4.0' of git://github.com/marcoraddatz/candyCMS-Tests into 4.0