Changes to test file ad helpers