Refactor & RSSI test