attempt to fix unit tests