Add more dependancies, fix test suite