Some file name changes, login controller tests, and some minor changes