moved dependency order to using class & made some tests green