Add tests and more instances