Fix API language and add failing test
First crack at support class callables