more test and even more fixes