Made some test improvements