Faster tests
some cleanup