Slight refactoring
perms 644 for test files
Typo fix