WIP checklist support and full test refactor
review and comments refactored