fixed #7
fixed test errors