Added a better test trigger and also better container