adding additional bean declaration and fixing tests