Fixed typo
Moved some tests around