Refactoring of acceptance tests and other small things. Also updated the readme