Updates to test class