Amends to Smoke Tests. Added some Timeouts, updated for text changes