Tests rewrited