Move test dependencies into test group