Move test into cluster benchmark and unit test