Various code tweaks
Remove Test Data system from UI
Finish removing Test Data system from UI
Database Update v2.0013