SMall bugfixes and added testData