Start of moving assertion boilerplate out
Added a TODO