Updated for functionality in test environment

Shout out to AY for squashing last minute bugs!