All Test PASS and all un-necessary Waits removed