Removed tests and added data initialization