Includes tests and a few more aliases.