Last test now passing as well.