fixed dependencies
some changes and additions for tests