fixing tests for #30