(Added assert failed compile) Fixed tests. Checked in missing code. Merged changes from G.