Fix tests for refactor
Added dependencies