Got all test working and added the before_submit check