Some old tests cleaned-up.