minor fix
some test improvements