Updating unit tests for Travis and hvvm