281 revised suite

Addresses #281.

Test suite fully runs now without issues;
(almost all of the tests fail. Looking into that).