#57 progress with tests.