Added test changes to get them to pass