Change and remove some leftovers from testing and autoformating