Revert "Revert "Cleanup some custom code for testing""

This reverts commit f45893b6b41af737d2f4badf6bce995e7d9d675c.
Fix crash
Fix Ring of Valor Under Map Z value