refactor signatures slightly, restore test suite to full testing