rejigged deps in tests
added bus
started the refactor of the versioning