reorganized tests

Also simplified holdings display.