fixed dependencies
fixing tests and error messages