1. Fixed test errors
2. Fixed WAR build error with Maven