Fixed failing unit tests
Tidied up deprecation warning in build script
Removed unused testing mocks.