stubbed out some failing assertions based on invalid assumptions, added
a couple of new tests