refactor tests:  move tests into separate modules to allow richer tests