Improved tests using givenData