Use viewport.getQuery() in testing
More tests passing (except lineplot) called in sequence