Rearranged unit tests. Stubbed out tests