Improve initial tests by including dependency