Merge pull request #6 from lynnaloo/unit-tests

skipped todo tests