Fixing id setting
Tweaking test
Formatting
Making tests pass
Merge pull request #13 from eberfreitas/master

Making tests pass... Basically...