a little test improvements