Remove external dependency on afterEach, mix bond api into returned spy object, test coverage for changes