Added timeout to be safe.
Added some temporary tests (failing at the moment).