Overrides, tests and version bump