Complete bluetooth test code move