More cleanup and speed up some tests

# Don't merge yet please