Updated features and acceptance tests (corrected some bugs in the tests).