some more test code
merge