Make new drive form submit button agnostic & fix outdated tests