Add tests and transform stub