FORGE-750: Improved tests