fix race condition on integration test initialization
cleanup tests and remove some unneccessary code
persist bike layer, travel mode, units