Added tests for other types