Upgrade to Spring Security OAuth 2.0.4
Update tests