Update unit tests
Update interfaces
Update Memory implementation