improving a bit on the test