wip: tests and a few focus fixes plus some deprecations