Add support for Action testing
TODOs update