Dim. noun added, some tests