Stregthen Tests Suite