Moved collision tests into the correct places. Closes #18.