Updates to make the package work in the real world, not just with tests