Update tests to reflect self submit changes