Fixed Unit Tests under latest API version