Added more resources and began adding unit tests