Adding some tests a couple changes and whatnot