add _prepare_integer
add tests for preparations
add remap test