- Separate non-static router class - Moved some setup code to new method, Core::init - Persistent database connection between tests