Finished writing tests for both 1.x and 2.x