Added a real test that tests on scratchy
Merge remote-tracking branch 'origin/dev' into dev