add some more test dependencies and remove unused tests