Issue #15: refactor, unit test skeleton