Fix some tersts
Tests pass! ....wink...