#347 autowired corrections, comment in test