no tests for the modifications to the shortcut functions?