Update to include tests