Updates some tests and fixes a couple things