fixed tests and structure
Merge branch 'master' of https://github.com/jimrybarski/fylm into 2-timestamp
fixed broken tests