Added mocks for remaining base types