Switch to preparedStatement
Magical refacto
Add separate test files
Ammend previous CI