Fix tests and add a couple new in-progress tests