Added @DataProvides example and some refactoring