Fixed Bean injection into Rest & Merged with Irin'as test fixes