Fixing test broken code