DELTASPIKE-487 tests and minor cleanup