Added test cases and missing timeout specifications. Need long timeout for CSR, until fixed (and then make 2S). Need to decide on whether to handle timeouts or raise exception