FQA-1218: run tests and fix bugs