refactored

new structure of bwtest,
changes in convert_test