Rearranged unit tests to be more in line with modules, made updates to main library