Feature: Tests restructured and pre_save only impacts new objects