some acceptance tests
fixed merge conflicts