Fix syntax issues
Fix bad test
Merge pull request #82 from manisandro/test_fixes

Test fixes