Move tests to right directory.
A few small cleanups.
More tests for super calls.