Progress on specs
Add empty test files
Cleaner syntax