- Refactored actions loading code to eliminate duplicated code. - Added relevant test case. - Fixes #588