Move and rename macro.html

Remove print statements
Fix code style

tests/app/main/dao/test_service_dao.py

@@ -71,4 +71,3 @@ def test_should_return_list_of_service_names(notifications_admin, notifications_
 
     actual = services_dao.find_all_service_names()
     assert actual == expected
-

tests/app/main/views/test_two_factor.py

@@ -51,7 +51,6 @@ def test_should_login_user_when_multiple_valid_codes_exist(notifications_admin,
         response = client.post('/two-factor',
                                data={'sms_code': '23456'})
         assert response.status_code == 302
-        print(user.id)
         codes = verify_codes_dao.get_codes(user_id=user.id, code_type='sms')
         # query will only return codes where code_used == False
         assert len(codes) == 0