replaced unused loggers with testlogger
improvements and general refactoring