Use a more generic way to access mappers, to handle the classic style too
Add almost all the same tests but using the classic mapping style