clean ups and fix some tests
Merge pull request #2 from cordoval/feature/cleanup

clean ups and fix some tests