Fixed small tests