Refactored & reorganized tests