Merge branch 'quick_tests'