Improve unit tests structure