Use Timestamp aliases for error reporting

Broken by commit 0636c4aaaacca20fba1728315f2ab53031602a98
Fix up test suite,  and add Array tests