spruce up tests