First test written.  Excess boilerplate from template mostly removed.