updated test suite(s) with more modular
style