fixed facts test. Some cleanup.