Add some test dependencies back