switch to SI standard and add test