Cleaned up useless methods from the DataWrapper\WrapperInterface, improved code coverage