fixed bugs in code but got new assertion error in tests. these need to be investigated before removing