Added tests for Current