Finished: removed tests/comments