report tests
merge stuff