Fixed fragile tests for @Bean method overloading
Polishing