I've added tests for the shortcut functions, rebased and squashed commits.

Thanks again!