added hamcrest dep
added timeouts