Added additional models and tests for AMP server