Test enhancements, re-populator scripts for testing