Fix tests to what their meant to be