small fixes and test adjustments