Removing timeouts.
Corrected tests to use match for right now