fixes and more tests

3 jobs for static_restructure in 3 minutes and 57 seconds (queued for 1 second)