fix failing tests by eager loading. remove some dependencies