fix unit tests structure