Correction of tests
Updated with more tests