singularize model names. minor changes and fixes to test variables