Implements more comprehensive test