Adjustments to logic so that tests pass on both Railo & ACF