Some tidying
Better stack launch testing