Tests work with Submit Feature refactor. 

Would like to discuss and possibly fix this up later, but this should fix the tests and the forced merge issue. Tests are all verbose now since lettuce doesn't like redirecting stdout underneath it. I changed the file naming a bit... the names are way better now. Major merge conflict fixed, I might not have done that right, but it works now.