Tests passing, ready for production