added file import, fixed controllers, added user tests