tests + alternative fix for last commit