Finish the tests for organisation

Also, add support for function stubbing into a test suite