#16 Fixed unit test