Changes made to get final test to pass