Worked on guide model unit tests, moved some code around