wip
Fix equality method, remove File properties
Add new spec
Tidy code