More dev code and tests.