* Close AppConfig and ScheduledQuery list by hand to improve CPU usage * Address review comments * Update remaining mocks