test suite completely updated

Needs new tests added