Improved the belongs to and updated the appropriate test cases to reflect the changes