fixes to Figurate Test