adjustments to app events and appRouter testing
More work in progress, added more tests, and improved lots of stuff