Merge branch 'simple_stuff' into action_events
fix tests
merge