QAART-137 fixes and new test cases