removed behaviour from child with test
merge