add mock assertions to remove errors
move around some commentary