fixing broken unit tests, stub for #32