Improved window action + action tests