Updated a couple unit tests