minor changes
fixed test
renaming