Update More functionality

Also includes a thing to test those functions