Riverbasim: moved datamodels and tests to misc folder. Slight mofidications in contexts