Add tests and other stuff