Bring in all the things that are needed from test_suite branch