Fixes test for 4
Writes test for 6