Better test coverage
Comment out the NotImplemented code for now.
Test coverage and comments.