These can be aliased elsewhere.
Forgot final if clause.
Added basic tests for types.