Small changes in tests and models..also pushing to refresh on my mac