Stabilized test + better assertion framework.

Should this really be commented out?