MISC: Refactors phpunit tests
Merge branch 'master' of github.com:IntersectAustralia/owncloud
Merge branch 'master' of github.com:IntersectAustralia/owncloud