Fixed Condition Type Test
Merge branch 'master' of github.com:BillysInterns/hv-client