Updated Speed, resistance, (power) models and tests

Merge in the amended speed, (power), resistance mappers and tests