Maybe fix unit tests