reverted some hardcoded testing