Tidied up dependencies in build script. Tidied up unit test report from Test target.