Updates to test structure