small test improvements