Updates to test