Added new tests to cover new types