fixed conversion factors to pass all tests