Add controller tests for notes_controller

Fix User factory

Finish test for notes_controller
Address conflicts in test