Fix Test Cases
less var
Ready for updated testing