HOVAS-1031 Add unit tests