Fixing a last bit and a test