test refined.
test and interface refining.
added support for "@row, @/row"