add test
fix merge conflict iin rspec
add authentication module