Rearranged unit tests

Fixed som unit tests