Added FindOne, moved some code around to better reflect its use. Find now runs on the Collection
Moved tests to different files to reflect usage