LIVEOAK-407

Move around location of system level resources and update tests