Updated component to keep working on test data