Refactoring
Minor change
Minor change
Refactoring
Improve webapp UT
Replace Beaker cookie management