Making comments tests optional
Fixed tests
Marked as 3.1 compatible