Update aws spec helper and ensure passing elements
Temporary commit. Restructure app shutdown procedures etc