Moved test model to fixtures directory
Factored out unnecessary method
Updated todo list
Queries get the right collection again