More trigger parsing and test fixing
Fix mongo/init tests