Fixed missing unit tests