added data folder and test methods