put set tests in new file; test citation include/omit fails
Merge branch 'dev'