Cleanup, use unittest2 and base layers.