add - add tests and checks