Updating test cases to return true/false