[SG] refactored/cleaned up some tests, changed insertfixtures