New test changes to cleanup