Test #1 fixes

Test #1 fixed