Tests fixed and :vhs: