-Starting to update test structure