Moved tests to their right places