Updated tests for now