more DI in tests, logger changed to android specific