small test/fixes