Core rewrite: Added tests for subclass and proxy.