Added grep option for own tests
Lower default timeout
Implemented closures for promises