Add support for Action testing; other minor improvements pls see commit messages