Fixing test files: now everything is green

closes #33
closes #35