Add tests and scripts too