Restore tests

Fix time notifications and other issues that prevented the client tests from working.

@allisoncorey