misc tests/fixes