Reorganized assertion numbering. Reconnected existing tests.
Added additional assertions, clarified contents.