Added 2D expected and 8BPP 2D tests.