Made some test adjustments