[Unit Tests #38] Added missing type checks