replace make command with variable
add more tests
remove unused legacy unit prefixes
tune unit selection limits