Own new test + some mistakes were corrected