remove !..nil? in tests
refactor and remove odd models tests