Fixed tests and removed very long comment