acceptance tests and some bugs are fixed