More tests, not all working yet.
Fix for lastest tests.