add more test + bugfix