Fixed spelling error.

Restructered some tests and removed a duplicate.