More tests; cleaned up estimate methods.