Removing hardcoded test data