byte/short handling + test from Hendrik Saly for our mapper