Some tests, two methods, and tiny fix