Added many shortcuts. Cleaned up internals. Improved test layout.
Meta