Minor internal refactor
saveModel first test