More logic for testing