started to rewrite acceptance tests to be more semantic