Fix up names; begin adding unittests.