More tests added ...