commit 4 testfixes