Add tests and update version