Merged Sami's cases to own branch, updated test script.