Refinements.
Adding testing stub from sagapilot