Merge "Springboot Integration tests improvements"