extend test and fix bug
renames