Tests = OK

Passed all tests suggested by Francis Scott in the forum