combine some tests into a test_deeply
Merge branch 'dev' into taint