various test dep fixes