test: generic fixes