changed test and others