some small test improvements