work on tests and validation