Add tests and files