Added tests for 2.0.8