Updated tests with new subjects (Val has left)
Updated AWS push routines to use environment variable if it's defined.