Remove unneccessary joins from tests