fix including files. Add tests