Updated tests for Current