Fixed some test errors due to bad kwarg logic