Add and modify tests