Flatten test structure, remove test for removed fn. Fixes #868