removed the logic for the fallback handler, its out of place, adapted the "test"