I supplemented the Genki books with the Try! series (N5-N1) which are tailored more to correspond with the JLPT levels. They don't correlate completely with the Genki chapters (Try! N5 & N4 are roughly Genki I plus the first few chapters of Genki II), but they provide additional exercises and also introduce vocabulary that's not in Genki. The books also come with the answer key, so it comes in handy if you don't necessarily want to go through the workbook with a teacher.

I found this website with a list of Japanese textbooks to help you prepare for different levels of the JLPT exam but as they're for specific Japanese levels I'm sure you could find one that could help you.

<a href="https://www.lingopressbooks.com/japanese/best-japanese-jlpt-textbooks/" rel="noopener noreferrer" target="_blank">https://www.lingopressbooks.com/japanese/best-japanese-jlpt-textbooks/</a>;

@torusan They sound perfect :D I shall give those books a try. Thank you :)