Code cleaning - autowiring into test fixed