Feature assert all actions

Rebased with current develop and fixed couple of conflcts and tests.
Let me know for any issues.