rename inconsistent test class
add -compact, clean up some manual implementations