changed test organization