Fixed a few unittests
Fixed the QA tests