more improvements to fact testing

However, they are still broken