Removing duplicate bean reference
Fixing include for unit test