cleanup
fixed test