fixed test methods
fixed tests