Removed TODO items that have been resolved.
Implemented integration test using py.test framework.