fix unit tests, but I am not sure if they all make sense