Speed up tests (second try)