The first book that comes to mind is Fundamentals of Physics by Resnick, Halliday and Walker. It contains good amount of exercises on these two chapters.
Another good book is Concepts of Physics by H. C. Verma. These concepts are covered in Volume 2 of the book. Any chapter in Prof. Verma's book contains a huge number of sophisticated problems, many a times the number ranging to 80 or above.
I would prefer both books equally, but I think (though I cannot guarantee) that Prof. Verma's book has better exercises.