Fixed unit test short-coming