Cleanup, test fixes..