Add and fix test