Not sure if I can trust the tests or code anymore...