Added tests for both existing and upcoming features.