lazy testing refactor (stick em all in the same test)