Remove TODO: tests working