Refactor spec a bit to prepare for diff
Pointer notes