Conrinue tests rewrite