Developer class fixes plus some basic tests.