FORGE-1488: Added more tests