[#64] Minor refactor of test code