Work on #261 for ClassOrInterface
More thorough tests for #261
Fix #261 in js