Sync up with branch marianne-geom-vline
Move broken test to end of script so that all the rest executes
Run tests with outputs for branch marianne-geom-vline