more tests, cleanups

9 jobs for PowerGrid in 17 minutes and 24 seconds (queued for 2 seconds)