Reset causes tests to fail

I pulled from master on EAK and configured this repo to work with the latest changes. Sorry it's such a big pile of commits. Fixed flickering acceptance tests.