Reorganized basic quote tests into sub-describe
Merge branch 'allen' into dev