changed test structure