Fixes to get Core tests passing 100% with Core Persistence

A number of small code fixes and changes to test parameters.