Fix bugs for JSON serialization
Fix bugs on server test file
Update controller route