Fixed tests for QA-470