merged new login page and mocha tests