Removed test that cause CI servers to fail
Fixing test and polished.
Fixed test
Fixed test
Fixed test
Fixed test on CI servers