expand and more tests
bugfix
bugfix+testfix
temp commit (by cron)