Upped test timeout to 60s. Fixed #12