#61 - unit test patch