Fixing basics, added some (untracked) test data