Features/91 radar crawl test

Correct codes as review comments.