Remove n00b mistake and fix tests