Fix types rbin test
Remove self referenced classes (wip)