use full constant name
removed unnecessary tests
rely only on acceptance tests
added topic helpers