Add SRU Test & exception handling