More tests

Ready for production.