Cleaned up a few lines, discovered a test was never written