More tests/fixes