Divided up the checking of dependencies and added additional test skeletons