Updating tests for #16