[#4] Fix some tests