working tests, failing test for save_related
merge