Added missing unit tests