Add tests for witnesses and new study