Converted TODOs into tests