Michael|George Add autowired bean "timeProvider" which maps to Clock objects. Configured .properties files to switch clock based on environment. Commented out SAMLService class and Test, using SAMLService2 everywhere.