Fixing more tests to stop timeout on travis
Fixing more tests