More aliases
more tweaks to the test