some cleanup, some fixes
adds test for notifications back in; some cleanup; collection tests work