Changed structure of bluetest