Added some initial Mocha tests and started working more on the 'Administration' API
Merged desynchronised branches