Fixed all the tests for 2-D