Remove unused tests
Adjust testing dependencies