interim commit of refactor + valid unit tests for UavConnection