rename Checkbox dir, add new tests