Fix excludes and files copied on install
Change bean definitions for compatibility
Fix method invocation in test
Update CreateOauth2TestApps for recent changes