Merge pull request #156 from University-of-Auckland/aaf-develop

Fix several issues with tests: