Merge "Add the basic config to run through atest"