* fixed tests for #16