fixed broken test
merge