Fixed and re-enabled shell tests
Decreased timeout value