put some tests in a block to cut # of locals

seems to be hitting a size limit on the jvm