Fold tests + remove throws Exception