Make test more comparable to production work pattern