small test suite rework/addition