more stuff moved out of action.php
fixed another test file