Cleanup, test changes