simplified and speed up the tests