test data and bugfixen