adding comment tests
removing some fixed code