Removed dependancies that were not being used and updated test suite