Use model id constants instead of strings all over the code
Update server test certificate truststore