Try to improve unit tests