Refactored tests to accept new area of law