fixing tests that was broken due to wrong depency order