I would highly recommend Oxford's worksheets - a combination of explanatory notes and questions. It's essential that you work through the lot methodically from start to finish, rather than jump straight into the questions. Regrettably, I've given my copy to someone else.