refactor code to load constant object when loading it instead of passing through request.
--- modify integration test to suit this change