Added sample data and some tests (Fix 5 failing tests tomorrow)