fixed test, renamed properties