Update to new test structure and make some minor modifications