Fix di strict mode and tests

Issue #35 
Issue #31