Make the tests slightly more likely to run
Implement lazy support