add misc adjustments to tests