Add the QA tests requested by Alvaro in issue #106