Start work on constructor injection with the API and a failing test (and
some small fixes)