Test code edited, more options enabled