adds test structure. and other changes