Tests cleaned up and data files added for tests