Add beatrix test to test subscription alignment CHANGE_OF_PLAN
Also move insertion of subscription events so they get correctly ordered (correct record_id)