More tests added - most pass, a couple of failures to fix.