Code refactoring and cleanup
Fix:
	SqlInsertTests
	SqlUpdateTests