Delete CustomMessage, add endpoint to APSMessage, fix connection and tests.