Method update + some tests