enhance acceptance tests, update spec tests