Moving from test-extensions, adding tests.