Changed back to using UUIDs, made tests transactional