Test . Fix a few things.