Removed tests prematurely added from previous refactor