enhanced flatmap test, and reformatted tests