Merging:
Corrected code for full test
Corrected code for full test