[#549] Fix some tests