Updated tests for some cleaner runtime and test failure scenarios