Correct me if I'm wrong but none of these additions have unittests.