Update tests & fix some careless mistakes