Fixed bogus test and implementation