Fixed tests that were accidentally corrupted by 84c397d56660466288ca27877b8de9e5d89f6fe4
Merge branch 'master' into QUICK
WiP