Move ubuntu setup to script so it can be run for manual testing;
Simplify test