more test and bugfix