RF: removed old spinach
TST: updated tests to reflect new spinach, model