Updates
Updated tests working
Merge pull request #4 from codealchemy/working-branch

Updating tests