Added transactions to old DAO tests of system user, refactoring