Fixed some tests and a copy/paste issue.