added integration test for login and also added a few new gems for testing
resolved merge conflicts