hopefully fix unit tests